# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1088+1.1069.3.7 -> 1.1089 # include/linux/sched.h 1.37.1.3 -> 1.43 # kernel/sysctl.c 1.23.1.2 -> 1.25 # Makefile 1.193.1.29 -> 1.229 # include/asm-ia64/page.h 1.7.1.1 -> 1.10 # arch/ia64/kernel/setup.c 1.11.2.2 -> 1.20 # fs/proc/proc_misc.c 1.23.1.2 -> 1.25 # drivers/char/agp/agpgart_be.c 1.41.1.17 -> 1.52 # arch/ia64/kernel/ivt.S 1.8.1.1 -> 1.11 # drivers/char/Config.in 1.39.1.11 -> 1.51 # include/linux/fs.h 1.76.1.3 -> 1.82 # drivers/scsi/Makefile 1.20.1.1 -> 1.22 # drivers/pci/pci.c 1.38.1.6 -> 1.42 # drivers/net/Makefile 1.33.1.5 -> 1.38 # arch/ia64/mm/Makefile 1.1.1.4 -> 1.6 # arch/i386/kernel/mpparse.c 1.30.1.4 -> 1.34 # arch/i386/config.in 1.44.1.2 -> 1.48 # arch/i386/kernel/io_apic.c 1.29.1.3 -> 1.35 # drivers/char/drm/i810_dma.c 1.9.1.1 -> 1.11 # include/asm-ia64/processor.h 1.16.2.4 -> 1.28 # arch/i386/kernel/pci-pc.c 1.31.1.1 -> 1.33 # include/linux/pci_ids.h 1.46.1.20 -> 1.70 # arch/ia64/mm/init.c 1.7.3.2 -> 1.19 # drivers/net/tg3.c 1.62.1.5 -> 1.70 # mm/memory.c 1.54.1.6 -> 1.62 # arch/i386/kernel/setup.c 1.70.1.3 -> 1.76 # arch/ia64/kernel/acpi.c 1.6.4.4 -> 1.31 # arch/ia64/config.in 1.13.4.4 -> 1.28 # drivers/pci/pci.ids 1.46 -> 1.47 # arch/ia64/hp/common/sba_iommu.c 1.1.3.2 -> 1.15 # drivers/net/tg3.h 1.27.1.2 -> 1.30 # mm/mmap.c 1.29.1.6 -> 1.36 # kernel/sched.c 1.34.1.1 -> 1.36 # Documentation/Configure.help 1.166.1.11 -> 1.175 # drivers/char/Makefile 1.31.1.5 -> 1.36 # fs/inode.c 1.40.1.1 -> 1.42 # arch/i386/kernel/pci-irq.c 1.22.1.2 -> 1.26 # diff -Nru a/include/asm-ia64/page.h b/include/asm-ia64/page.h --- a/include/asm-ia64/page.h Wed Oct 8 09:06:34 2003 +++ b/include/asm-ia64/page.h Wed Oct 8 09:06:34 2003 @@ -59,6 +59,7 @@ #endif #define RGN_MAP_LIMIT ((1UL << (4*PAGE_SHIFT - 12)) - PAGE_SIZE) /* per region addr limit */ + #ifdef __ASSEMBLY__ # define __pa(x) ((x) - PAGE_OFFSET) # define __va(x) ((x) + PAGE_OFFSET)